55651a9b93e442ecb5cec2eb6226711845c92de2,ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java,UpgradeCatalog221,updateAMSConfigs,#,205

Before Change


            }
            if (amsHbaseSiteProperties.containsKey(ZK_CLIENT_PORT)) {
              String newValue = "{{zookeeper_clientPort}}";
              LOG.info("Replacing value of hbase.zookeeper.property.clientPort from " +
                amsHbaseSiteProperties.get(ZK_CLIENT_PORT) + " to " + newValue);

              newProperties.put(ZK_CLIENT_PORT, newValue);
            }

After Change



            // Skip override if custom port found in embedded mode.
            if (amsHbaseSiteProperties.containsKey(ZK_CLIENT_PORT) &&
               (isDistributed || amsHbaseSiteProperties.get(ZK_CLIENT_PORT).equals("61181"))) {
              String newValue = "{{zookeeper_clientPort}}";
              LOG.info("Replacing value of " + ZK_CLIENT_PORT + " from " +
                amsHbaseSiteProperties.get(ZK_CLIENT_PORT) + " to " +